Auto merge of #1460 - apasel422:1459, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 26 Mar 2015 19:29:34 +0000 (19:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 26 Mar 2015 19:29:34 +0000 (19:29 +0000)
commit11507ddf41f96b95a2527ea48d5d8bebea3021a9
tree464707d3fe75cbb81e0a3433f397593602ca78ef
parent7ffc0c5772347d82e1983489e72909bfe0c6eda9
parenta18b2e5078be119e82d35819cbb0c26583fa204e
Auto merge of #1460 - apasel422:1459, r=alexcrichton

closes #1459